[FIX] Following Python Class conventions; making names pretty