Cleanup of naming conventions