Some variables have been renamed