[#121] Use AWS naming convention