Renaming things and adding metadata

Change-Id: I06fa77d1e261fed26a783061162ad110cb295f69