Clean up naming