Further changes to renaming the application names to be correct.