Restructure the naming code.
Continue adding support for U. F. O. layer names.
Fix compilation problems.