Added name mapping for myself