Misc. fixes related to name change