Shorter names
New names on dependencies