Tweaks to migration and moved trait to a namespace without the word "Trait" in it (reserved!).