Change counted to use simple name as well