Compatibility with other users and make aws name more descriptive