Per Chisel meeting.

signalName -> instanceName
SignalId -> InstanceId
Based on Stephen's comments on PR

2 files changed, 9 insertions, 9 deletions

diff --git a/chiselFrontend/src/main/scala/chisel3/core/Module.scala b/chiselFrontend/src/main/scala/chisel3/core/Module.scala
index eb48a14d..2426ae78 100644
--- a/chiselFrontend/src/main/scala/chisel3/core/Module.scala
+++ b/chiselFrontend/src/main/scala/chisel3/core/Module.scala
@@ -78,7 +78,7 @@ extends HasId {
 
 
   /** Signal name (for simulation). */
-  override def signalName =
+  override def instanceName =
     if (_parent == None) name else _component match {
       case None => getRef.name
       case Some(c) => getRef fullName c
diff --git a/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala b/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala
index bf78c410..2dec78bb 100644
--- a/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala
+++ b/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala
@@ -59,14 +59,14 @@ private[chisel3] class IdGen {
   * currently, the node's name, the full path name, and references to its parent Module and component.
   * These are only valid once the design has been elaborated, and should not be used during its construction.
   */
-trait SignalId {
-  def signalName: String
+trait InstanceId {
+  def instanceName: String
   def pathName: String
   def parentPathName: String
   def parentModName: String
 }
 
-private[chisel3] trait HasId extends SignalId {
+private[chisel3] trait HasId extends InstanceId {
   private[chisel3] def _onModuleClose {} // scalastyle:ignore method.name
   private[chisel3] val _parent = Builder.dynamicContext.currentModule
   _parent.foreach(_.addId(this))
@@ -108,7 +108,7 @@ private[chisel3] trait HasId extends SignalId {
   private[chisel3] def getRef: Arg = _ref.get
 
   // Implementation of public methods.
-  def signalName = _parent match {
+  def instanceName = _parent match {
     case Some(p) => p._component match {
       case Some(c) => getRef fullName c
       case None => throwException("signalName/pathName should be called after circuit elaboration")
@@ -116,16 +116,16 @@ private[chisel3] trait HasId extends SignalId {
     case None => throwException("this cannot happen")
   }
   def pathName = _parent match {
-    case None => signalName
-    case Some(p) => s"${p.pathName}.$signalName"
+    case None => instanceName
+    case Some(p) => s"${p.pathName}.$instanceName"
   }
   def parentPathName = _parent match {
     case Some(p) => p.pathName
-    case None => throwException(s"$signalName doesn't have a parent")
+    case None => throwException(s"$instanceName doesn't have a parent")
   }
   def parentModName = _parent match {
     case Some(p) => p.modName
-    case None => throwException(s"$signalName doesn't have a parent")
+    case None => throwException(s"$instanceName doesn't have a parent")
   }
 }