Yes, those names are much better :)