Cleaned up project naming