changed header filenames to avoid conflicts
fixed registration bug