Fixed names and coding format