Cleaning up naming convention for clarity