refactoring names for better name conventions