fixed names class/methods, architecture