cleanup naming close #8