rename ConnectionMockup
remove comments