Cleaning up naming conventions