Feature/target rename and header dependencies