Better rename for shorter file/objects names