Rename classes and strings to be more descriptive