Code refactoring

Fix naming inconsistencies
Code refactoring

Fix naming inconsistencies
Deploy v1.0