Sanitize a ton of naming
Update requirements