solved problem 2

changed the naming so that things will be sorted correct.