Make class naming clearer