Changed naming of projects, remaning of elements still needs to be done