Clean up naming conventions to make them more meaningful