Cleaned up build warnings with renaming