Cleanup of naming convention.