Done! Changed names of configuration constants. Code Refactoring.