Rename display files and classes for consistency.