Improve naming and bundle setup