diff --git a/src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/ggiLduInterface/ggiLduInterface.H b/src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/ggiLduInterface/ggiLduInterface.H
index d51647f47..5e1e02b52 100644
--- a/src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/ggiLduInterface/ggiLduInterface.H
+++ b/src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/ggiLduInterface/ggiLduInterface.H
@@ -115,7 +115,7 @@ public:
         virtual const labelList& zoneAddressing() const = 0;
 
         //- Return fine level addressing
-        virtual const labelListList& addressing() const = 0;
+        virtual const labelListList& ggiAddressing() const = 0;
 
         //- Is the patch localised on a single processor
         virtual bool localParallel() const = 0;
@@ -124,7 +124,7 @@ public:
         virtual const mapDistribute& map() const = 0;
 
         //- Return weights
-        virtual const scalarListList& weights() const = 0;
+        virtual const scalarListList& ggiWeights() const = 0;
 
         //- Return face transformation tensor
         virtual const tensorField& forwardT() const = 0;
diff --git a/src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/mixingPlaneLduInterface/mixingPlaneLduInterface.H b/src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/mixingPlaneLduInterface/mixingPlaneLduInterface.H
index ed66070f1..e0d75473d 100644
--- a/src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/mixingPlaneLduInterface/mixingPlaneLduInterface.H
+++ b/src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/mixingPlaneLduInterface/mixingPlaneLduInterface.H
@@ -98,10 +98,10 @@ public:
         virtual const mixingPlaneLduInterface& shadowInterface() const = 0;
 
         //- Return fine level addressing
-        virtual const labelListList& addressing() const = 0;
+        virtual const labelListList& ggiAddressing() const = 0;
 
         //- Return weights
-        virtual const scalarListList& weights() const = 0;
+        virtual const scalarListList& ggiWeights() const = 0;
 
         //- Return face transformation tensor
         virtual const tensorField& forwardT() const = 0;
diff --git a/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/ggiAMGInterface/ggiAMGInterface.C b/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/ggiAMGInterface/ggiAMGInterface.C
index 0129d2e62..8c008d663 100644
--- a/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/ggiAMGInterface/ggiAMGInterface.C
+++ b/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/ggiAMGInterface/ggiAMGInterface.C
@@ -367,8 +367,8 @@ Foam::ggiAMGInterface::ggiAMGInterface
     {
         // This addressing defines how to interpolate for all zone faces
         // across the interface
-        const labelListList& fineAddr = fineGgiInterface_.addressing();
-        const scalarListList& fineWeights = fineGgiInterface_.weights();
+        const labelListList& fineAddr = fineGgiInterface_.ggiAddressing();
+        const scalarListList& fineWeights = fineGgiInterface_.ggiWeights();
 
         // Perform analysis only for local faces
         // HJ, 22/Jun/2016
@@ -1005,7 +1005,7 @@ Foam::ggiAMGInterface::ggiAMGInterface
                 if (fineGgiInterface_.fineLevel())
                 {
                     const labelListList& fineAddr =
-                        fineGgiInterface_.addressing();
+                        fineGgiInterface_.ggiAddressing();
 
                     nbrProc = neighbourExpandProc
                         [fineAddr[facesIter[0]][faceNbrsIter[0]]];
@@ -1141,9 +1141,9 @@ const Foam::labelList& Foam::ggiAMGInterface::zoneAddressing() const
 }
 
 
-const Foam::labelListList& Foam::ggiAMGInterface::addressing() const
+const Foam::labelListList& Foam::ggiAMGInterface::ggiAddressing() const
 {
-    FatalErrorIn("const labelListList& ggiAMGInterface::addressing() const")
+    FatalErrorIn("const labelListList& ggiAMGInterface::ggiAddressing() const")
         << "Requested fine addressing at coarse level"
         << abort(FatalError);
 
@@ -1183,9 +1183,9 @@ const Foam::mapDistribute& Foam::ggiAMGInterface::map() const
 }
 
 
-const Foam::scalarListList& Foam::ggiAMGInterface::weights() const
+const Foam::scalarListList& Foam::ggiAMGInterface::ggiWeights() const
 {
-    FatalErrorIn("const labelListList& ggiAMGInterface::weights() const")
+    FatalErrorIn("const labelListList& ggiAMGInterface::ggiWeights() const")
         << "Requested fine addressing at coarse level"
         << abort(FatalError);
 
diff --git a/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/ggiAMGInterface/ggiAMGInterface.H b/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/ggiAMGInterface/ggiAMGInterface.H
index 89678ec01..061b5058e 100644
--- a/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/ggiAMGInterface/ggiAMGInterface.H
+++ b/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/ggiAMGInterface/ggiAMGInterface.H
@@ -266,7 +266,7 @@ public:
             virtual const labelList& zoneAddressing() const;
 
             //- Return addressing
-            virtual const labelListList& addressing() const;
+            virtual const labelListList& ggiAddressing() const;
 
             //- Is the patch localised on a single processor
             virtual bool localParallel() const;
@@ -275,7 +275,7 @@ public:
             const labelListList& procMasterFaces() const;
 
             //- Return weights
-            virtual const scalarListList& weights() const;
+            virtual const scalarListList& ggiWeights() const;
 
             //- Return face transformation tensor
             virtual const tensorField& forwardT() const;
diff --git a/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/mixingPlaneAMGInterface/mixingPlaneAMGInterface.C b/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/mixingPlaneAMGInterface/mixingPlaneAMGInterface.C
index 8ad4cc723..ece60ffa6 100644
--- a/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/mixingPlaneAMGInterface/mixingPlaneAMGInterface.C
+++ b/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/mixingPlaneAMGInterface/mixingPlaneAMGInterface.C
@@ -110,11 +110,11 @@ Foam::mixingPlaneAMGInterface::shadowInterface() const
 }
 
 
-const Foam::labelListList& Foam::mixingPlaneAMGInterface::addressing() const
+const Foam::labelListList& Foam::mixingPlaneAMGInterface::ggiAddressing() const
 {
     FatalErrorIn
     (
-        "const labelListList& mixingPlaneAMGInterface::addressing() const"
+        "const labelListList& mixingPlaneAMGInterface::ggiAddressing() const"
     )   << "Requested fine addressing at coarse level"
         << abort(FatalError);
 
@@ -122,11 +122,11 @@ const Foam::labelListList& Foam::mixingPlaneAMGInterface::addressing() const
 }
 
 
-const Foam::scalarListList& Foam::mixingPlaneAMGInterface::weights() const
+const Foam::scalarListList& Foam::mixingPlaneAMGInterface::ggiWeights() const
 {
     FatalErrorIn
     (
-        "const labelListList& mixingPlaneAMGInterface::weights() const"
+        "const labelListList& mixingPlaneAMGInterface::ggiWeights() const"
     )   << "Requested fine addressing at coarse level"
         << abort(FatalError);
     return scalarListList::null();
diff --git a/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/mixingPlaneAMGInterface/mixingPlaneAMGInterface.H b/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/mixingPlaneAMGInterface/mixingPlaneAMGInterface.H
index 47a8bc47b..bd79a5d24 100644
--- a/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/mixingPlaneAMGInterface/mixingPlaneAMGInterface.H
+++ b/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/mixingPlaneAMGInterface/mixingPlaneAMGInterface.H
@@ -203,10 +203,10 @@ public:
             virtual const mixingPlaneLduInterface& shadowInterface() const;
 
             //- Return addressing
-            virtual const labelListList& addressing() const;
+            virtual const labelListList& ggiAddressing() const;
 
             //- Return weights
-            virtual const scalarListList& weights() const;
+            virtual const scalarListList& ggiWeights() const;
 
             //- Return face transformation tensor
             virtual const tensorField& forwardT() const;
diff --git a/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/SAMGInterfaces/ggiSAMGInterface/ggiSAMGInterface.C b/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/SAMGInterfaces/ggiSAMGInterface/ggiSAMGInterface.C
index ddfe85f26..f6cfe1ce0 100644
--- a/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/SAMGInterfaces/ggiSAMGInterface/ggiSAMGInterface.C
+++ b/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/SAMGInterfaces/ggiSAMGInterface/ggiSAMGInterface.C
@@ -477,8 +477,8 @@ Foam::ggiSAMGInterface::ggiSAMGInterface
     {
         // This addressing defines how to interpolate for all zone faces
         // across the interface
-        const labelListList& fineAddr = fineGgiInterface_.addressing();
-        const scalarListList& fineWeights = fineGgiInterface_.weights();
+        const labelListList& fineAddr = fineGgiInterface_.ggiAddressing();
+        const scalarListList& fineWeights = fineGgiInterface_.ggiWeights();
 
         // Perform analysis only for local faces
         // HJ, 22/Jun/2016
@@ -1196,7 +1196,7 @@ Foam::ggiSAMGInterface::ggiSAMGInterface
                 if (fineGgiInterface_.fineLevel())
                 {
                     const labelListList& fineAddr =
-                        fineGgiInterface_.addressing();
+                        fineGgiInterface_.ggiAddressing();
 
                     nbrProc = neighbourExpandProc
                         [fineAddr[facesIter[0]][faceNbrsIter[0]]];
@@ -1332,9 +1332,9 @@ const Foam::labelList& Foam::ggiSAMGInterface::zoneAddressing() const
 }
 
 
-const Foam::labelListList& Foam::ggiSAMGInterface::addressing() const
+const Foam::labelListList& Foam::ggiSAMGInterface::ggiAddressing() const
 {
-    FatalErrorIn("const labelListList& ggiSAMGInterface::addressing() const")
+    FatalErrorIn("const labelListList& ggiSAMGInterface::ggiAddressing() const")
         << "Requested fine addressing at coarse level"
         << abort(FatalError);
 
@@ -1374,9 +1374,9 @@ const Foam::mapDistribute& Foam::ggiSAMGInterface::map() const
 }
 
 
-const Foam::scalarListList& Foam::ggiSAMGInterface::weights() const
+const Foam::scalarListList& Foam::ggiSAMGInterface::ggiWeights() const
 {
-    FatalErrorIn("const labelListList& ggiSAMGInterface::weights() const")
+    FatalErrorIn("const labelListList& ggiSAMGInterface::ggiWeights() const")
         << "Requested fine addressing at coarse level"
         << abort(FatalError);
 
diff --git a/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/SAMGInterfaces/ggiSAMGInterface/ggiSAMGInterface.H b/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/SAMGInterfaces/ggiSAMGInterface/ggiSAMGInterface.H
index e44a4c12e..440223e54 100644
--- a/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/SAMGInterfaces/ggiSAMGInterface/ggiSAMGInterface.H
+++ b/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/SAMGInterfaces/ggiSAMGInterface/ggiSAMGInterface.H
@@ -282,7 +282,7 @@ public:
             virtual const labelList& zoneAddressing() const;
 
             //- Return addressing
-            virtual const labelListList& addressing() const;
+            virtual const labelListList& ggiAddressing() const;
 
             //- Is the patch localised on a single processor
             virtual bool localParallel() const;
@@ -291,7 +291,7 @@ public:
             const labelListList& procMasterFaces() const;
 
             //- Return weights
-            virtual const scalarListList& weights() const;
+            virtual const scalarListList& ggiWeights() const;
 
             //- Return face transformation tensor
             virtual const tensorField& forwardT() const;