Fix #3

+ Update utility class names