Restored proper downcasing