Rename class/file for clarity.