Rename some variables and directories