Renames last bad uses of indicator
Fixes whole indicator creation during birth