Clean up naming conventions