Rename some classes to make them more clearly.