fixed named collisions, have stubs ready for announcements