small fix and rename