removed some less-awesome names