Fixed names and some compile issues
Fixed names and some compile issues