rename 'amaz_s3' to 'amaz'
cleanup