A little name change and rearrange