Changed to something generic for the time being

Change-Id: Iaff995cbb41c8f1c54278a862efe7feebaead13d