Better detection of local and global activity names