revised the naming file, removing tiers

Next big commit (should) have all the changes to file names.