more implementation of Edwin's renaming schema