Some Changes Made, Mostly renaming