renamed all main number classes