fix component names to be more explicit and not duplicated
change to RDS (Instance)
update couchdb templates and config modules