Renames for consistency.
Merge branch 'pipe_branch' of github.com:ilyanep/pintos-awesome