rename some variables
better way to solve #14 and #17