bug fix and rename

bug fix and rename