#87 fix some naming issues