Rename just about everything that didn't make any sense to me