Yes, for now at least the new code should be in the right format.
Unfortunately Eclipse does not have all the features that it has for Java in their XML editor and the settings are separate...
Thanks for fixing those.