gh-10 Solved name conflict for shortcodes.

There is no logic for prefixing the shortcodes yet. They where just be renamed to avoid name clonflicts.