Global technical edit for Activity vs activity