If it's not too much work, I think it would be preferable to have everything switched to using these if that is necessary, rather than have something half done that might cause confusion in the future.