* fixed inconsistencies in names