Changed naming of files to match Dart naming conventions