Fixes and naming