Rearrange naming for gem-like patterns