Names for new Staples

+some Bugfixes