Reference and naming Fixes