Rollback type name changes because python3.3