Shorter name
class naming fix