Changing more references from "active" to "enabled"