Removed deprecated calls and renamed method