[IMP-dev] Shortening names