made minor changes to naming conventions