Pointless refactorization
Moved name heuristics to a separate file
Beginning of a CORE interface