added name shortening to master