renamed

shortened the names to easier browsing