Adapt for newly assumed namespace; beta disable