renamed counters/functions for more consitent naming