Changed to match changed namespace in Common.