Refactoring of statemachine and URIs to use aliases