Improved creation pattern.

More renaming