Rename: 'extra.pp' => 'extras.pp'

The latter seems clearer to me.

Change-Id: I7311fd401f38c65904140116958c5e049950e0bc