Refactor all sources to use name Selma