Refining

refining a few of the name fixes, and started on the Alias fix