Renaming done to close #76