changed naming convention for consistency