FIX:: issues (2) & (3) -- naming & segregated compilation