Finish aligning metadata namespace with the code