Fixed naming convention (underscores -> camel, classes to Pascal)