Simplify and rename mapit api classes