Some edits, some rename. Awaiting TC first.