Adds in missing deprecation mappings. Move builder api onto new names instead too