Renaming component to follow conventions