diff --git a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/XmlParser.java b/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/XmlParser.java
index c9581af..0b308c2 100644
--- a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/XmlParser.java
+++ b/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/XmlParser.java
@@ -2,8 +2,9 @@
  * ============LICENSE_START=======================================================
  * openECOMP : SDN-C
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modifications Copyright © 2018 IBM.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,6 +77,9 @@
             return properties;
         }
 
+        StringBuilder currentName = new StringBuilder();
+        StringBuilder currentValue = new StringBuilder();
+
         public Handler(Set<String> listNameList) {
             super();
             this.listNameList = listNameList;
@@ -83,9 +87,6 @@
                 this.listNameList = new HashSet<>();
         }
 
-        StringBuilder currentName = new StringBuilder();
-        StringBuilder currentValue = new StringBuilder();
-
         @Override
         public void startElement(String uri, String localName, String qName, Attributes attributes)
                 throws SAXException {
diff --git a/template-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/template/TemplateNode.java b/template-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/template/TemplateNode.java
index 8a96768..0b5850a 100644
--- a/template-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/template/TemplateNode.java
+++ b/template-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/template/TemplateNode.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
  * 			reserved.
+ * Modifications Copyright © 2018 IBM.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,9 +38,9 @@
 
 public class TemplateNode implements SvcLogicJavaPlugin {
     private static final Logger logger = LoggerFactory.getLogger(TemplateNode.class);
-    public final static String TEMPLATE_PATH = "templatePath";
-    public final static String OUTPUT_PATH_KEY = "output";
-    public final static String PREFIX_KEY = "prefix";
+    public static final String TEMPLATE_PATH = "templatePath";
+    public static final String OUTPUT_PATH_KEY = "output";
+    public static final String PREFIX_KEY = "prefix";
     public final static String REQUIRED_PARAMETERS_ERROR_MESSAGE = "templateName & outputPath are required fields";
     protected static final String TEMPLATE_PROPERTIES_FILE_NAME = "template-node.properties";
     protected static final String DEFAULT_PROPERTIES_DIR = "/opt/onap/ccsdk/data/properties";