A small amount of renaming to keep things consistent