Rename other 'app' classes for consistency