new classe names for consistency