Remove guava
Rename from AAM to ADAM