downloads

Switched order and renamed for better consistency
Removed download attribute where unneeded