More migration to the Serenity namespace