Refactoring the names of variables to setup for better physics steps.