Fixed class names to CamelCase and added stack