improve: changing the mutability namespace