naming conventions improvings