mv EnvironmentVariable.{Key,Name}

Signed-off-by: Amit Gupta <agupta@pivotallabs.com>