Change some names to allow deploy to Amazon EC2