fixed naming issues for first occurence