Fixes due to eclipse auto-rename