Minor fixes

1. Proper naming for AWS variables
2. Proper @timestamp field for Kibana