changed naming conventions to more broad terms