reworked targets to avoid namespace collisions