Rename class file
Yet more syntax fix