trying to make the names a bit more consistent and disambiguous