fixed inconsistencies between naming