clean up and rename models