Bones of old.* syntax
Clean-up. Add proper aliases