Class diagram fix afrer namespace renames