Wrapped nospam methods and renamed some other methods to have more consistent names