Fixing some naming inconsistencies
updating tag version