cleanup names for @btipling