Renaming basics to be more consistent