Rename inappropriate name of methods - closed #13