BREAKING CHANGE -> NAMING OF PROCEDURES CHANGED
Updated with tests, descriptions and naming.