Fixed naming on classes api