Rename some variables and symbols to better follow the common naming style