rename variable + remove the default origin configuration parameter

CM only was already implemented one year ago. i just did a bit of refactoring in order to support multishortcode on the same connection.