Removed acceleration constructor and made some renames for consistency