Further sidechain modifications and rename