Update with new naming and better packaging