Updated to use normal requirements names.

Change-Id: I20545a3250c7db826b5c9133b8a94e3a8b2a3dbf