change variable names for consistencyy