Make headers more uniform
Resolve conflicting alias
SVN add shortcut