updated naming to better follow conventions
ACTUALLY UPDATED DURR