Rename to shorter names