merges the naming stuff to ipamproviders and added marvel as ipamprovider