Rename to make room for SpaceRequirement that fetches the space from an arg

Signed-off-by: Damien Le Berrigaud <damien@pivotallabs.com>
Rename to make room for OrgRequirement that fetches the org from an arg

Signed-off-by: Damien Le Berrigaud <damien@pivotallabs.com>